From c52dde0ef34d682b2009e8fdcee0b1c9a2bf536c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 2 Mar 2015 20:31:13 -0800 Subject: [PATCH] Relax output restrictions to make a test less flaky Due to random hash map traversals this test could build either crate `a` or crate `b` first, causing the first four output lines to possibly change. Two of the first four lines are guaranteed to be the compilation of `b` and the other two are the compilation of `a` as well as building its build script, but no other lines about compiling `a` can happen until the dependency `b` has finished compiling. --- tests/test_cargo_compile_custom_build.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs index 90b617cc2..1eca4f439 100644 --- a/tests/test_cargo_compile_custom_build.rs +++ b/tests/test_cargo_compile_custom_build.rs @@ -563,10 +563,10 @@ test!(propagation_of_l_flags { assert_that(p.cargo_process("build").arg("-v").arg("-j1"), execs().with_status(0) .with_stdout(format!("\ -{compiling} a v0.5.0 (file://[..]) -{running} `rustc a[..]build.rs [..]` -{compiling} b v0.5.0 (file://[..]) -{running} `rustc [..] --crate-name b [..]-L foo[..]` +[..] +[..] +[..] +[..] {running} `[..]a-[..]build-script-build[..]` {running} `rustc [..] --crate-name a [..]-L bar[..]-L foo[..]` {compiling} foo v0.5.0 (file://[..]) -- 2.30.2